[XEN] Fix cset 14166

Signed-off-by: Tim Deegan <Tim.Deegan@xensource.com>

diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c
index 219a358d0b121725a7526a460e2f4f0acebe7ae3..a1e09502702e0f1e00a1b0ad11c66215f90e3935 100644 (file)
--- a/xen/arch/x86/domain.c
+++ b/xen/arch/x86/domain.c
@@ -501,11 +501,9 @@ int arch_set_info_guest(
     unsigned long flags;
     int i, rc = 0, compat;
 
-    /* The context is a compat-mode one if *either* the calling domain 
-     * or the target domain is compat-mode: if the caller is compat, it
-     * won't know to make a native context, and if the target is compat,
-     * the tools will have made a compat-mode context for it. */
-    compat = IS_COMPAT(d) || IS_COMPAT(current->domain);
+    /* The context is a compat-mode one if the target domain is compat-mode;
+     * we expect the tools to DTRT even in compat-mode callers. */
+    compat = IS_COMPAT(d);
 
 #ifdef CONFIG_COMPAT
 #define c(fld) (compat ? (c.cmp->fld) : (c.nat->fld))